Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Convert islot_seed to generic_factory #40371

Merged
merged 1 commit into from
May 11, 2020

Conversation

anothersimulacrum
Copy link
Member

Summary

SUMMARY: Infrastructure "Move islot_seed to generic_factory"

Purpose of change

Work towards #36851

Describe the solution

Convert Item_factory::load( islot_seed &slot ... ) to islot_seed::load(...)
Use mandatory, optional, and assign where appropriate in place of reading directly from the JsonObject.
Add islot_ammo::deserialize()
Use assign to load itype::seed, instead of load_islot_optional()

Testing

No loading errors running the tests with and without mod JSON.
Test run and pass.
Planting, growing and harvesting crops works as expected.

@KorGgenT KorGgenT added the Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style label May 9, 2020
@kevingranade kevingranade merged commit 22331cc into CleverRaven:master May 11, 2020
@anothersimulacrum anothersimulacrum deleted the seed-factory branch May 11, 2020 15:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Code: Infrastructure / Style / Static Analysis Code internal infrastructure and style
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants